fix coding issues